Autogenerated HTML docs for v1.6.0-rc0-42-g186458
diff --git a/git-diff-tree.html b/git-diff-tree.html index 3f9519e..8cf9409 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -971,11 +971,11 @@ This flag changes the way a merge commit patch is displayed, in a similar way to the <em>-c</em> option. It implies the <em>-c</em> and <em>-p</em> options and further compresses the patch output - by omitting hunks that show differences from only one - parent, or show the same change from all but one parent - for an Octopus merge. When this optimization makes all - hunks disappear, the commit itself and the commit log - message is not shown, just like in any other "empty diff" case. + by omitting uninteresting hunks whose the contents in the parents + have only two variants and the merge result picks one of them + without modification. When all hunks are uninteresting, the commit + itself and the commit log message is not shown, just like in any other + "empty diff" case. </p> </dd> <dt> @@ -1855,7 +1855,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-22 09:19:07 UTC +Last updated 2008-07-24 04:02:40 UTC </div> </div> </body>
diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 0e45b58..8c8f35b 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt
@@ -93,11 +93,11 @@ This flag changes the way a merge commit patch is displayed, in a similar way to the '-c' option. It implies the '-c' and '-p' options and further compresses the patch output - by omitting hunks that show differences from only one - parent, or show the same change from all but one parent - for an Octopus merge. When this optimization makes all - hunks disappear, the commit itself and the commit log - message is not shown, just like in any other "empty diff" case. + by omitting uninteresting hunks whose the contents in the parents + have only two variants and the merge result picks one of them + without modification. When all hunks are uninteresting, the commit + itself and the commit log message is not shown, just like in any other + "empty diff" case. --always:: Show the commit itself and the commit log message even
diff --git a/git-filter-branch.html b/git-filter-branch.html index 9e25539..4567d3b 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html
@@ -550,7 +550,7 @@ <div class="para"><p>A significantly faster version:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt>git filter-branch --index-filter 'git update-index --remove filename' HEAD</tt></pre> +<pre><tt>git filter-branch --index-filter 'git rm --cached filename' HEAD</tt></pre> </div></div> <div class="para"><p>Now, you will get the rewritten history saved in HEAD.</p></div> <div class="para"><p>To set a commit (which typically is at the tip of another @@ -665,7 +665,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-06 05:16:46 UTC +Last updated 2008-07-24 04:02:40 UTC </div> </div> </body>
diff --git a/git-filter-branch.txt b/git-filter-branch.txt index a3edc00..7ba9dab 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt
@@ -191,7 +191,7 @@ A significantly faster version: -------------------------------------------------------------------------- -git filter-branch --index-filter 'git update-index --remove filename' HEAD +git filter-branch --index-filter 'git rm --cached filename' HEAD -------------------------------------------------------------------------- Now, you will get the rewritten history saved in HEAD.
diff --git a/git-log.html b/git-log.html index 2e087ed..48e9525 100644 --- a/git-log.html +++ b/git-log.html
@@ -1030,9 +1030,9 @@ <dd> <p> This flag implies the <em>-c</em> options and further compresses the - patch output by omitting hunks that show differences from only - one parent, or show the same change from all but one parent for - an Octopus merge. + patch output by omitting uninteresting hunks whose contents in + the parents have only two variants and the merge result picks + one of them without modification. </p> </dd> <dt> @@ -2030,7 +2030,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-22 09:19:10 UTC +Last updated 2008-07-24 04:02:42 UTC </div> </div> </body>
diff --git a/git-rerere.html b/git-rerere.html index b579159..95331b9 100644 --- a/git-rerere.html +++ b/git-rerere.html
@@ -354,7 +354,7 @@ <dd> <p> This resets the metadata used by rerere if a merge resolution is to be -is aborted. Calling <em>git-am --skip</em> or <em>git-rebase [--skip|--abort]</em> +aborted. Calling <em>git-am [--skip|--abort]</em> or <em>git-rebase [--skip|--abort]</em> will automatically invoke this command. </p> </dd> @@ -529,7 +529,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-22 09:19:15 UTC +Last updated 2008-07-24 04:02:42 UTC </div> </div> </body>
diff --git a/git-rerere.txt b/git-rerere.txt index beebd53..89f321b 100644 --- a/git-rerere.txt +++ b/git-rerere.txt
@@ -37,7 +37,7 @@ 'clear':: This resets the metadata used by rerere if a merge resolution is to be -is aborted. Calling 'git-am --skip' or 'git-rebase [--skip|--abort]' +aborted. Calling 'git-am [--skip|--abort]' or 'git-rebase [--skip|--abort]' will automatically invoke this command. 'diff'::
diff --git a/git-rev-list.html b/git-rev-list.html index b7f5bd6..d987a1f 100644 --- a/git-rev-list.html +++ b/git-rev-list.html
@@ -569,9 +569,9 @@ <dd> <p> This flag implies the <em>-c</em> options and further compresses the - patch output by omitting hunks that show differences from only - one parent, or show the same change from all but one parent for - an Octopus merge. + patch output by omitting uninteresting hunks whose contents in + the parents have only two variants and the merge result picks + one of them without modification. </p> </dd> <dt> @@ -1345,7 +1345,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-16 03:23:21 UTC +Last updated 2008-07-24 04:02:43 UTC </div> </div> </body>
diff --git a/rev-list-options.txt b/rev-list-options.txt index b6f5d87..3aa3809 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt
@@ -112,9 +112,9 @@ --cc:: This flag implies the '-c' options and further compresses the - patch output by omitting hunks that show differences from only - one parent, or show the same change from all but one parent for - an Octopus merge. + patch output by omitting uninteresting hunks whose contents in + the parents have only two variants and the merge result picks + one of them without modification. -r::
diff --git a/technical/api-string-list.html b/technical/api-string-list.html index 7095ff7..05ce239 100644 --- a/technical/api-string-list.html +++ b/technical/api-string-list.html
@@ -367,7 +367,7 @@ string_list_append("foo", &list); string_list_append("bar", &list); for (i = 0; i < list.nr; i++) - printf("%s\n", list.items[i].path)</tt></pre> + printf("%s\n", list.items[i].string)</tt></pre> </div></div> <div class="admonitionblock"> <table><tr> @@ -497,7 +497,7 @@ </p> </li> </ul></div> -<div class="para"><p>Represents an item of the list. The <tt>path</tt> member is a pointer to the +<div class="para"><p>Represents an item of the list. The <tt>string</tt> member is a pointer to the string, and you may use the <tt>util</tt> member for any purpose, if you want.</p></div> <div class="ilist"><ul> <li> @@ -534,7 +534,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-22 09:19:19 UTC +Last updated 2008-07-24 04:02:44 UTC </div> </div> </body> diff --git a/technical/api-string-list.txt b/technical/api-string-list.txt index 92b3ecd..293bb15 100644 --- a/technical/api-string-list.txt +++ b/technical/api-string-list.txt
@@ -41,7 +41,7 @@ string_list_append("foo", &list); string_list_append("bar", &list); for (i = 0; i < list.nr; i++) - printf("%s\n", list.items[i].path) + printf("%s\n", list.items[i].string) ---- NOTE: It is more efficient to build an unsorted list and sort it @@ -113,7 +113,7 @@ * `struct string_list_item` -Represents an item of the list. The `path` member is a pointer to the +Represents an item of the list. The `string` member is a pointer to the string, and you may use the `util` member for any purpose, if you want. * `struct string_list` 